Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 6 May 2010 03:24:12 +0000 (03:24 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 6 May 2010 03:24:12 +0000 (03:24 +0000)
commit9573bec59e683f7a31bbe5445d3ddfbbf5b5e388
tree863ad3610722032b01d7fecabb5e4fec8c1381e2
parent29bb36733cfab642fe7cdf1e2b052d7513efa1b8
parent9b534d9de4edda694842b4b711df4df2e52d2492
Merge from mainline.